test_change = executable(
'test-css-change',
'test-css-change.c',
+ '../../testutils.c',
c_args: common_cflags,
dependencies: libgtk_dep,
install: get_option('install-tests'),
#include <string.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include "testsuite/testutils.h"
#ifdef G_OS_WIN32
# include <io.h>
return g_string_free (file, FALSE);
}
-static char *
-diff_with_file (const char *file1,
- char *text,
- gssize len,
- GError **error)
-{
- const char *command[] = { "diff", "-u", file1, NULL, NULL };
- char *diff, *tmpfile;
- int fd;
-
- diff = NULL;
-
- if (len < 0)
- len = strlen (text);
-
- /* write the text buffer to a temporary file */
- fd = g_file_open_tmp (NULL, &tmpfile, error);
- if (fd < 0)
- return NULL;
-
- if (write (fd, text, len) != (int) len)
- {
- close (fd);
- g_set_error (error,
- G_FILE_ERROR, G_FILE_ERROR_FAILED,
- "Could not write data to temporary file '%s'", tmpfile);
- goto done;
- }
- close (fd);
- command[3] = tmpfile;
-
- /* run diff command */
- g_spawn_sync (NULL,
- (char **) command,
- NULL,
- G_SPAWN_SEARCH_PATH,
- NULL, NULL,
- &diff,
- NULL, NULL,
- error);
-
-done:
- g_unlink (tmpfile);
- g_free (tmpfile);
-
- return diff;
-}
-
static void
style_context_changed (GtkWidget *window, const char **output)
{
testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
testdatadir = join_paths(installed_test_datadir, 'css')
-test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
+test_nodes = executable('test-css-nodes', 'test-css-nodes.c', '../../testutils.c',
c_args: common_cflags,
install: get_option('install-tests'),
install_dir: testexecdir,
#include <string.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include "testsuite/testutils.h"
#ifdef G_OS_WIN32
# include <io.h>
return g_string_free (file, FALSE);
}
-static char *
-diff_with_file (const char *file1,
- char *text,
- gssize len,
- GError **error)
-{
- const char *command[] = { "diff", "-u", file1, NULL, NULL };
- char *diff, *tmpfile;
- int fd;
-
- diff = NULL;
-
- if (len < 0)
- len = strlen (text);
-
- /* write the text buffer to a temporary file */
- fd = g_file_open_tmp (NULL, &tmpfile, error);
- if (fd < 0)
- return NULL;
-
- if (write (fd, text, len) != (int) len)
- {
- close (fd);
- g_set_error (error,
- G_FILE_ERROR, G_FILE_ERROR_FAILED,
- "Could not write data to temporary file '%s'", tmpfile);
- goto done;
- }
- close (fd);
- command[3] = tmpfile;
-
- /* run diff command */
- g_spawn_sync (NULL,
- (char **) command,
- NULL,
- G_SPAWN_SEARCH_PATH,
- NULL, NULL,
- &diff,
- NULL, NULL,
- error);
-
-done:
- g_unlink (tmpfile);
- g_free (tmpfile);
-
- return diff;
-}
-
static void
style_context_changed (GtkWidget *window, const char **output)
{
testexecdir = join_paths(installed_test_bindir, 'css', 'parser')
testdatadir = join_paths(installed_test_datadir, 'css')
-test_parser = executable('test-css-parser', 'test-css-parser.c',
+test_parser = executable('test-css-parser', 'test-css-parser.c', '../../testutils.c',
c_args: common_cflags,
install: get_option('install-tests'),
install_dir: testexecdir,
#include <string.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include "testsuite/testutils.h"
#ifdef G_OS_WIN32
# include <io.h>
return g_string_free (file, FALSE);
}
-static GBytes *
-diff_with_file (const char *file1,
- char *text,
- gssize len,
- GError **error)
-{
- GSubprocess *process;
- GBytes *input, *output;
-
- process = g_subprocess_new (G_SUBPROCESS_FLAGS_STDIN_PIPE
- | G_SUBPROCESS_FLAGS_STDOUT_PIPE,
- error,
- "diff", "-u", file1, "-", NULL);
- if (process == NULL)
- return NULL;
-
- input = g_bytes_new_static (text, len >= 0 ? len : strlen (text));
- if (!g_subprocess_communicate (process,
- input,
- NULL,
- &output,
- NULL,
- error))
- {
- g_object_unref (process);
- g_bytes_unref (input);
- return NULL;
- }
-
- if (!g_subprocess_get_successful (process) &&
- /* this is the condition when the files differ */
- !(g_subprocess_get_if_exited (process) && g_subprocess_get_exit_status (process) == 1))
- {
- g_clear_pointer (&output, g_bytes_unref);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- "The `diff' process exited with error status %d",
- g_subprocess_get_exit_status (process));
- }
-
- g_object_unref (process);
- g_bytes_unref (input);
-
- return output;
-}
-
static void
append_error_value (GString *string,
GType enum_type,
GtkCssProvider *provider;
char *css, *css_file, *reference_file, *errors_file;
GString *errors;
- GBytes *diff;
+ char *diff;
GError *error = NULL;
css_file = g_file_get_path (file);
diff = diff_with_file (reference_file, css, -1, &error);
g_assert_no_error (error);
- if (diff && g_bytes_get_size (diff) > 0)
+ if (diff && diff[0])
{
- g_test_message ("Resulting CSS doesn't match reference:\n%s",
- (const char *) g_bytes_get_data (diff, NULL));
+ g_test_message ("Resulting CSS doesn't match reference:\n%s", diff);
g_test_fail ();
}
g_free (reference_file);
- g_clear_pointer (&diff, g_bytes_unref);
+ g_free (diff);
errors_file = test_get_errors_file (css_file);
diff = diff_with_file (errors_file, errors->str, errors->len, &error);
g_assert_no_error (error);
- if (diff && g_bytes_get_size (diff) > 0)
+ if (diff && diff[0])
{
- g_test_message ("Errors don't match expected errors:\n%s",
- (const char *) g_bytes_get_data (diff, NULL));
+ g_test_message ("Errors don't match expected errors:\n%s", diff);
g_test_fail ();
}
- g_clear_pointer (&diff, g_bytes_unref);
+ g_free (diff);
}
else if (errors->str[0])
{
test_style = executable(
'test-css-style',
'test-css-style.c',
+ '../../testutils.c',
cssresources,
c_args: common_cflags,
dependencies: libgtk_dep,
#include <string.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include "testsuite/testutils.h"
#ifdef G_OS_WIN32
# include <io.h>
return g_string_free (file, FALSE);
}
-static GBytes *
-diff_with_file (const char *file1,
- char *text,
- gssize len,
- GError **error)
-{
- GSubprocess *process;
- GBytes *input, *output;
-
- process = g_subprocess_new (G_SUBPROCESS_FLAGS_STDIN_PIPE
- | G_SUBPROCESS_FLAGS_STDOUT_PIPE,
- error,
- "diff", "-u", file1, "-", NULL);
- if (process == NULL)
- return NULL;
-
- input = g_bytes_new_static (text, len >= 0 ? len : strlen (text));
- if (!g_subprocess_communicate (process,
- input,
- NULL,
- &output,
- NULL,
- error))
- {
- g_object_unref (process);
- g_bytes_unref (input);
- return NULL;
- }
-
- if (!g_subprocess_get_successful (process) &&
- /* this is the condition when the files differ */
- !(g_subprocess_get_if_exited (process) && g_subprocess_get_exit_status (process) == 1))
- {
- g_clear_pointer (&output, g_bytes_unref);
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- "The `diff' process exited with error status %d",
- g_subprocess_get_exit_status (process));
- }
-
- g_object_unref (process);
- g_bytes_unref (input);
-
- return output;
-}
-
static char *
fixup_style_differences (const char *str)
{
GtkBuilder *builder;
GtkWidget *window;
char *output;
- GBytes *diff;
+ char *diff;
char *ui_file, *css_file, *reference_file;
GtkCssProvider *provider;
GError *error = NULL;
diff = diff_with_file (reference_file, output, -1, &error);
g_assert_no_error (error);
- if (diff && g_bytes_get_size (diff) > 0)
+ if (diff && diff[0])
{
- g_test_message ("Resulting output doesn't match reference:\n%s", (const char *) g_bytes_get_data (diff, NULL));
+ g_test_message ("Resulting output doesn't match reference:\n%s", diff);
g_test_fail ();
}
g_free (reference_file);
- g_clear_pointer (&diff, g_bytes_unref);
+ g_free (diff);
out:
gtk_style_context_remove_provider_for_display (gdk_display_get_default (),
focus_chain = executable(
'test-focus-chain',
- sources: ['test-focus-chain.c'],
+ sources: ['test-focus-chain.c', '../testutils.c'],
dependencies: libgtk_dep,
c_args: common_cflags,
install: get_option('install-tests'),
#include <string.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include "testsuite/testutils.h"
#ifdef G_OS_WIN32
# include <io.h>
{ GTK_DIR_RIGHT, "right" }
};
-static char *
-diff_with_file (const char *file1,
- char *text,
- gssize len,
- GError **error)
-{
- const char *command[] = { "diff", "-u", file1, NULL, NULL };
- char *diff, *tmpfile;
- int fd;
-
- diff = NULL;
-
- if (len < 0)
- len = strlen (text);
-
- /* write the text buffer to a temporary file */
- fd = g_file_open_tmp (NULL, &tmpfile, error);
- if (fd < 0)
- return NULL;
-
- if (write (fd, text, len) != (int) len)
- {
- close (fd);
- g_set_error (error,
- G_FILE_ERROR, G_FILE_ERROR_FAILED,
- "Could not write data to temporary file '%s'", tmpfile);
- goto done;
- }
- close (fd);
- command[3] = tmpfile;
-
- /* run diff command */
- g_spawn_sync (NULL,
- (char **) command,
- NULL,
- G_SPAWN_SEARCH_PATH,
- NULL, NULL,
- &diff,
- NULL, NULL,
- error);
-
-done:
- g_unlink (tmpfile);
- g_free (tmpfile);
-
- return diff;
-}
-
static void
check_focus_states (GtkWidget *focus_widget)
{
installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk-4.0')
installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk-4.0')
-# We call diff in various tests, so we need to check it's available,
-# otherwise we're going to have failures down the line
-diff = find_program('diff', required: true)
-
common_env = [
'GIO_USE_VOLUME_MONITOR=unix',
'GSETTINGS_BACKEND=memory',
--- /dev/null
+/*
+ * Copyright © 2021 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen <mclasen@redhat.com>
+ */
+
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <unistd.h>
+#include "testsuite/testutils.h"
+
+char *
+diff_with_file (const char *file1,
+ char *text,
+ gssize len,
+ GError **error)
+{
+ const char *command[] = { "diff", "-u", file1, NULL, NULL };
+ char *diff, *tmpfile;
+ int fd;
+
+ diff = NULL;
+
+ if (g_find_program_in_path ("diff"))
+ {
+ if (len < 0)
+ len = strlen (text);
+
+ /* write the text buffer to a temporary file */
+ fd = g_file_open_tmp (NULL, &tmpfile, error);
+ if (fd < 0)
+ return NULL;
+
+ if (write (fd, text, len) != (int) len)
+ {
+ close (fd);
+ g_set_error (error,
+ G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ "Could not write data to temporary file '%s'", tmpfile);
+ goto done;
+ }
+ close (fd);
+ command[3] = tmpfile;
+
+ /* run diff command */
+ g_spawn_sync (NULL,
+ (char **) command,
+ NULL,
+ G_SPAWN_SEARCH_PATH,
+ NULL, NULL,
+ &diff,
+ NULL, NULL,
+ error);
+
+done:
+ g_unlink (tmpfile);
+ g_free (tmpfile);
+ }
+ else
+ {
+ char *buf1;
+ gsize len1;
+
+ if (!g_file_get_contents (file1, &buf1, &len1, error))
+ return NULL;
+
+ if ((len != -1 && len != len1) ||
+ strncmp (text, buf1, len1) != 0)
+ diff = g_strdup ("Files differ.\n");
+
+ g_free (buf1);
+ }
+
+ return diff;
+}
--- /dev/null
+#pragma once
+
+char * diff_with_file (const char *file1,
+ char *text,
+ gssize len,
+ GError **error);
+
projects / gtk4.git / commitdiff